Generate correct output on NumCPU() when using cgroups2 #9816

nickorlow · 2023-03-31T05:47:32Z

Updates the NumCPU() function in pkg/util/runtime/cpu_linux.go to work with cgroups2.

What this PR does / why we need it:

Change is required for proper functionality with cgroups2.

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
CVE Report (Scanner found CVE and adding report)
Breaking change (fix or feature that would cause existing functionality to change)
Documentation only

Which issue/s this PR fixes

Fixes #9665

How Has This Been Tested?

Generated example files that were within the [cgroups2 spec](https://docs.kernel.org/admin-guide/cgroup-v2.html and
tested our code to ensure it returned the correct outputs for each case.

Checklist:

My change requires a change to the documentation.
I have updated the documentation accordingly.
I've read the CONTRIBUTION guide
I have added unit and/or e2e tests to cover my changes.
All new and existing tests passed.
Added Release Notes.

Does my pull request need a release note?

Added support for detecting CPU count properly when using cgroups2

linux-foundation-easycla · 2023-03-31T05:47:40Z

The committers listed above are authorized under a signed CLA.

✅ login: nickorlow / name: Nicholas Orlowsky (a8028a5, 7c4ac85, 7f64726, 0f4d054, be6f1d5, 8f86603, e4a1129, 3a64d74, b270b4a, 3814e1f, c5dad5e, fddf4e0, c23cc0c, a080ea1, 0a01f55, 3ae35a0, ad1fb03, 30dc629, 3714c2c, 405a5aa, 475adf7, aa9a876, 63fb4c6, 8621dfc, 6d96e11, e9f3717, 9e79a36, f35dae9, 221e85f, b2d67ff, ac0f6fc, dad8086, a9f9793)
✅ login: sridharnandigam / name: Sridhar Nandigam (165d057)

k8s-ci-robot · 2023-03-31T05:47:41Z

Welcome @nickorlow!

It looks like this is your first PR to kubernetes/ingress-nginx 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/ingress-nginx has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2023-03-31T05:47:41Z

Hi @nickorlow. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

longwuyuan · 2023-03-31T06:20:12Z

Hi @nickorlow ,

Thanks for this.

Please explore contributing tests for this.
Particularly e2e tests.

regards

longwuyuan · 2023-03-31T06:21:01Z

/triage accepted
/kind bug

nickorlow · 2023-03-31T06:22:49Z

Hi @nickorlow ,

Thanks for this.

Please explore contributing tests for this. Particularly e2e tests.

regards

Should we include the tests in this PR or make a separate one?

longwuyuan · 2023-03-31T06:55:39Z

I think that the change and the e2e-test in this PR will help feedback. thanks

tao12345666333 · 2023-07-17T05:56:00Z

Thank you for your contribution

LeMyst · 2023-09-12T17:43:31Z

LGTM for the moment

LeMyst

Everything seems to be cgroup2 Unified Mode compatible and cgroup1.
Otherwise it fallback to no limit.
LGTM

LeMyst · 2023-09-12T17:42:26Z

test/e2e/cgroups/cgroups.go

+		file.WriteString("4 2")
+		file.Sync()
+
+		assert.Equal(ginkgo.GinkgoT(), runtime.GetCgroupVersion(), int64(2))
+		assert.Equal(ginkgo.GinkgoT(), runtime.NumCPU(), 2)


Can you set a more complex and more realistic test, for cgroups v1 and v2.
Something like "50000 100000" to get a NumCPU at 0,5 ?

runephilosof-karnovgroup · 2023-12-06T15:05:14Z

@nickorlow @tao12345666333 Looks like this is stalled/forgotten?

nickorlow · 2023-12-06T15:15:52Z

@nickorlow @tao12345666333 Looks like this is stalled/forgotten?

I think so.. anything more I need to do to have this merged? I believe all requested changes have been made

LeMyst · 2024-02-19T13:41:38Z

Any news?

netlify · 2024-02-21T16:42:08Z

✅ Deploy Preview for kubernetes-ingress-nginx canceled.

Name	Link
🔨 Latest commit	`e9f3717`
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/664b5add62526c000838b40f

scenusa-bd · 2024-03-29T16:11:00Z

Any plans to have this merged? Thanks!

tao12345666333 · 2024-03-30T15:14:21Z

@nickorlow Sorry for the long long delay, could you please resolve the conflicts and make a rebase?
Then we can move forward, thank you!

divigarg · 2024-05-17T19:04:59Z

@nickorlow , can we get this through, please? thank you :)

nickorlow · 2024-05-20T15:43:33Z

@tao12345666333 Everything updated. Had to make some changes to the tests since docker mounts the cgroup directory as ro unless you run it in privileged mode.

strongjz · 2024-07-01T20:33:07Z

/lgtm

k8s-ci-robot · 2024-07-01T20:33:15Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: LeMyst, nickorlow, strongjz

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [strongjz]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

strongjz · 2024-07-01T20:33:19Z

/cherry-pick release-1.11

k8s-infra-cherrypick-robot · 2024-07-01T20:33:21Z

@strongjz: once the present PR merges, I will cherry-pick it on top of release-1.11 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

LeMyst · 2024-08-01T12:56:29Z

Are there any updates on this topic? What is preventing the merge of this PR?

k8s-infra-cherrypick-robot · 2024-08-12T18:54:14Z

@strongjz: #9816 failed to apply on top of branch "release-1.11":

Applying: file parsing for Cgroup2
Applying: added version detecting
Applying: ran gofmt
Applying: declarations to assignments
Applying: correct types
Applying: added test boilerplate
Using index info to reconstruct a base tree...
M	test/e2e/e2e.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/e2e.go
CONFLICT (content): Merge conflict in test/e2e/e2e.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0006 added test boilerplate
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

nickorlow added 2 commits March 30, 2023 11:48

file parsing for Cgroup2

e4a1129

added version detecting

221e85f

k8s-ci-robot requested review from ElvinEfendi and tao12345666333 March 31, 2023 05:47

k8s-ci-robot added the needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. label Mar 31, 2023

nickorlow added 3 commits March 31, 2023 00:52

ran gofmt

3ae35a0

declarations to assignments

7f64726

correct types

a080ea1

added test boilerplate

f35dae9

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 16, 2023

added test boilerplate

dad8086

k8s-ci-robot removed the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 16, 2023

gofmt

be6f1d5

LeMyst approved these changes Sep 14, 2023

View reviewed changes

nickorlow added 2 commits February 21, 2024 16:41

bump to rerun ci

0a01f55

bump to rerun ci

63fb4c6

nickorlow added 4 commits May 18, 2024 02:10

Merge branch 'kubernetes:main' into main

9e79a36

fix lint errors

ac0f6fc

fix tests

b2d67ff

fix v1 test

e9f3717

k8s-ci-robot assigned strongjz Jul 1, 2024

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 1, 2024

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 1, 2024

strongjz merged commit 6c404a5 into kubernetes:main Aug 12, 2024
26 of 27 checks passed

This was referenced Aug 12, 2024

Generate correct output on NumCPU() when using cgroups2 #11775

Merged

Generate correct output on NumCPU() when using cgroups2 #11778

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Generate correct output on NumCPU() when using cgroups2 #9816

Generate correct output on NumCPU() when using cgroups2 #9816

nickorlow commented Mar 31, 2023 •

edited

Loading

linux-foundation-easycla bot commented Mar 31, 2023 •

edited

Loading

k8s-ci-robot commented Mar 31, 2023

k8s-ci-robot commented Mar 31, 2023

longwuyuan commented Mar 31, 2023

longwuyuan commented Mar 31, 2023

nickorlow commented Mar 31, 2023 •

edited

Loading

longwuyuan commented Mar 31, 2023

tao12345666333 commented Jul 17, 2023

LeMyst commented Sep 12, 2023

LeMyst left a comment

LeMyst Sep 12, 2023

runephilosof-karnovgroup commented Dec 6, 2023 •

edited

Loading

nickorlow commented Dec 6, 2023

LeMyst commented Feb 19, 2024

netlify bot commented Feb 21, 2024 •

edited

Loading

scenusa-bd commented Mar 29, 2024

tao12345666333 commented Mar 30, 2024

divigarg commented May 17, 2024

nickorlow commented May 20, 2024

strongjz commented Jul 1, 2024

k8s-ci-robot commented Jul 1, 2024

strongjz commented Jul 1, 2024

k8s-infra-cherrypick-robot commented Jul 1, 2024

LeMyst commented Aug 1, 2024

k8s-infra-cherrypick-robot commented Aug 12, 2024

Generate correct output on NumCPU() when using cgroups2 #9816

Generate correct output on NumCPU() when using cgroups2 #9816

Conversation

nickorlow commented Mar 31, 2023 • edited Loading

What this PR does / why we need it:

Types of changes

Which issue/s this PR fixes

How Has This Been Tested?

Checklist:

Does my pull request need a release note?

linux-foundation-easycla bot commented Mar 31, 2023 • edited Loading

k8s-ci-robot commented Mar 31, 2023

k8s-ci-robot commented Mar 31, 2023

longwuyuan commented Mar 31, 2023

longwuyuan commented Mar 31, 2023

nickorlow commented Mar 31, 2023 • edited Loading

longwuyuan commented Mar 31, 2023

tao12345666333 commented Jul 17, 2023

LeMyst commented Sep 12, 2023

LeMyst left a comment

Choose a reason for hiding this comment

LeMyst Sep 12, 2023

Choose a reason for hiding this comment

runephilosof-karnovgroup commented Dec 6, 2023 • edited Loading

nickorlow commented Dec 6, 2023

LeMyst commented Feb 19, 2024

netlify bot commented Feb 21, 2024 • edited Loading

✅ Deploy Preview for kubernetes-ingress-nginx canceled.

scenusa-bd commented Mar 29, 2024

tao12345666333 commented Mar 30, 2024

divigarg commented May 17, 2024

nickorlow commented May 20, 2024

strongjz commented Jul 1, 2024

k8s-ci-robot commented Jul 1, 2024

strongjz commented Jul 1, 2024

k8s-infra-cherrypick-robot commented Jul 1, 2024

LeMyst commented Aug 1, 2024

k8s-infra-cherrypick-robot commented Aug 12, 2024

nickorlow commented Mar 31, 2023 •

edited

Loading

linux-foundation-easycla bot commented Mar 31, 2023 •

edited

Loading

nickorlow commented Mar 31, 2023 •

edited

Loading

runephilosof-karnovgroup commented Dec 6, 2023 •

edited

Loading

netlify bot commented Feb 21, 2024 •

edited

Loading